From eca595007b09876285913250248fa75a9a9780f9 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Tue, 12 Jun 2007 15:23:55 -0600 Subject: [PATCH] [IA64] libxc trivial fix compilation error. Signed-off-by: Isaku Yamahata --- tools/libxc/ia64/xc_ia64_hvm_build.c | 2 +- tools/libxc/xc_dom_ia64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/ia64/xc_ia64_hvm_build.c b/tools/libxc/ia64/xc_ia64_hvm_build.c index 0c0a9e36e0..73fc03a597 100644 --- a/tools/libxc/ia64/xc_ia64_hvm_build.c +++ b/tools/libxc/ia64/xc_ia64_hvm_build.c @@ -834,7 +834,7 @@ xc_ia64_setup_memmap_info(int xc_handle, uint32_t dom, assert(nr_mds <= (PAGE_SIZE * memmap_info_num_pages - - offsetof(*memmap_info, memdesc))/sizeof(*md)); + offsetof(typeof(*memmap_info), memdesc))/sizeof(*md)); memmap_info->efi_memmap_size = nr_mds * sizeof(*md); memmap_info->efi_memdesc_size = sizeof(*md); memmap_info->efi_memdesc_version = EFI_MEMORY_DESCRIPTOR_VERSION; diff --git a/tools/libxc/xc_dom_ia64.c b/tools/libxc/xc_dom_ia64.c index 7c7eac0eb2..dfe27e6917 100644 --- a/tools/libxc/xc_dom_ia64.c +++ b/tools/libxc/xc_dom_ia64.c @@ -203,9 +203,9 @@ static int ia64_setup_memmap(struct xc_dom_image *dom) num_mds++; memmap_info->efi_memmap_size = num_mds * sizeof(md[0]); munmap(memmap_info, page_size * memmap_info_num_pages); - assert(nr_mds <= + assert(num_mds <= (page_size * memmap_info_num_pages - - offsetof(*memmap_info, memdesc))/sizeof(*md)); + offsetof(typeof(*memmap_info), memdesc))/sizeof(*md)); /* * kludge: we need to pass memmap_info page's pfn and other magic pages -- 2.30.2